bitkeeper revision 1.1607 (429c2f231bx3kugLWzaDsPB4OQMBAA)
authorcl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Tue, 31 May 2005 09:32:19 +0000 (09:32 +0000)
committercl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Tue, 31 May 2005 09:32:19 +0000 (09:32 +0000)
Merge

1  2 
tools/python/xen/xend/XendConsole.py

index 98294c4e313fd036a9321cde35f6f80bd02ba109,fd7b603cd6b0094036dbfa9f2f89f399d32f65b8..7a04f5ddde75cc0420a9436fdacb3f1ede8d1f1f
@@@ -1,11 -1,13 +1,8 @@@
  # Copyright (C) 2004 Mike Wray <mike.wray@hp.com>
  
- import xen.lowlevel.xc
- xc = xen.lowlevel.xc.new()
 +import XendRoot; xroot = XendRoot.instance()
  from XendError import XendError
  
 -import EventServer
 -eserver = EventServer.instance()
 -
 -from xen.xend.server import SrvDaemon
 -daemon = SrvDaemon.instance()
 -
  class XendConsole:
  
      def  __init__(self):